Removed old code from the User class
